JMI formatting problems

I'm experiencing two kinds of formatting problems with JMI generated 
source code:

1.  When I add any kind of statement to a try block, the indentation is 
wrong.  The statements are being placed in the same tab position as the 
try block itself.  This is happening for MethodInvocation and Return 
statements, and maybe for other kinds of statements.  LocalVariables, by 
contrast, are being indented correctly within the try block.

2. Annotations are being set without a newline after it.  While this may 
be technically correct because it's just another Modifier, by convention 
(and for readability) annotations IMO should appear on a line by 
themselves.  After the newline, the annotated element (class, method, 
local variable, etc) should be indented.

I've searched Issuezilla, but didn't find any bugs reported on these two 
problems.  If these bugs aren't known to you, I can file them. 
--Jeri