Right, I covered that in my edit which I probably made as you were writing your post. It was just one of those situations where a small amount of confusion compounds until you have lost sight of reality.

Ah yep, definitely hadn't seen your edit. :) Sorry for the churn.