Changes from my earlier stab at completing this kata.