Tweaks for #381 Google Closure support