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