Refactoring Combos

Compose multiple refactoring steps into larger refactorings.