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