A little more refactoring that fixes what I broke.