Comment 2 for bug 462013

I've commented on the MP: you definitely want separate branches for these, because that will make them much easier for review. Btw, thanks for both the refactoring and the fix.