Tidy a few closure compiler nits