Refactoring this yak so it can be shaved more efficiently.