Fixed up a few places with the code inspection's suggestions.