Ah, ok. I suppose we'll take refactorings where we can get them!