[#702] Lint and whitespace cleanup.