Well, you've already fixed it, right? :smile: 

So let's try to do as much refactoring as we have the energy to before we turn our attention to some other bit of the code.