solve compile errors due to recent changes (my settings are less permissive than default)
organize imports and remove unnecessary casts
Authored by: thibautd 2013-10-08
Parent: [r26061]
Child: [r26063]