Actually continue to do refactoring. If you think this was unexpected... Nobody expected the Spanish inquisition either!