Fixes to make closure compiler happy.
Merge pull request #81 from rixner/master

Fixes to make closure compiler happy with pull request #80.