Some cleanup to please jshint.