JSH/Lint fixes.