Stripped out all refactoring infrastructure.