Right, rewritten the offensive bit of code. (And yes, I did mean offensive, not just offending :/) Now to run the full test suite and find out which tests should not be passing...