refs #26, #39, #38 Take care of the majority of the lint errors, we'll leave the
redefs and comma errors.