Switch to java 7 level conventions.
Update to conform to latest bb-optimization chagnes.