--- a/Method.st	Fri Mar 27 09:47:10 2015 +0100
+++ b/Method.st	Fri Mar 27 10:22:02 2015 +0100
@@ -401,12 +401,20 @@
     |annots|
 
     annots := self annotationsAt:aSymbol.
-    annots isEmptyOrNil ifTrue:[^ exceptionValue value].
+    annots isEmptyOrNil ifTrue:[
+        (aSymbol endsWith:$:) ifFalse:[
+            annots := self annotationsAt:(aSymbol,$:) asSymbol.
+        ].
+        annots isEmptyOrNil ifTrue:[
+            ^ exceptionValue value
+        ].
+    ].
     ^ annots first arguments first
 !
 
 attributeMessages
-    ^ self annotations
+    ^ self annotations 
+        collect:[:annot | Message selector:annot key arguments:annot arguments]
 !
 
 classIsMeta
@@ -1014,7 +1022,6 @@
     "Modified (format): / 18-11-2011 / 14:47:06 / cg"
 ! !
 
-
 !Method methodsFor:'accessing-visibility'!
 
 isIgnored
@@ -3646,7 +3653,6 @@
     "Created: / 23-07-2012 / 11:16:36 / cg"
 ! !
 
-
 !Method methodsFor:'source management'!
 
 revisionInfo
@@ -3894,11 +3900,11 @@
 !Method class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.458 2015-03-25 10:52:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.459 2015-03-27 09:22:02 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.458 2015-03-25 10:52:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Method.st,v 1.459 2015-03-27 09:22:02 cg Exp $'
 !
 
 version_SVN