Indentation and jsdoc fixes driven by jscs.

Separated these out to make add-jscs small and clean.
Hopefully these indentation fixes are agreeable.