Fixes to play well with Google's JS compiler.
Fixes to play well with Google's JS compiler.

NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,google/CodeCity