Compilation level 1.6 clean up.