Corrected a few lint-type recommendations.