Fixes and improvements from Closure compiler.