Fix based on Hound comments.