Minor comment and code style fixes. [ci skip]
Make Underscore build of `template` use `defaults` again.