Fix linting errors.

# Changes
 - Cleans up some linting errors. Fixes #3610.