Some more changes in dumping annots.
Fixing static field annotations
Fix in printing type params.