Some supertired refactorings