Simple fixes to keep Google Closure compiler happy