All tests still pass with this solution. Pushed! Don't know what *I* was thinking...