Style cleanup to make it mostly jslint-clean.