Bowling tweaks and red-green-refactor.