Simplify some code that was making my OCD twitch.