Fix annotations and some code for last Closure library release.

Related to
https://code.google.com/p/closure-library/source/detail?r=04e77e721b6e8a
01a6dd94137082461de03033fe