PC-Lint: add column numbers.  Cleanup.