Craig's wacky refactorings