clean up and changes to allow a GWT compile with "-strict" flag.