Address some lint warnings.

Getting my toes wet...


... by addressing some lint warnings from the current master branch build.