Clean up code DRY'd in previous commit.