Refactoring Combos

Compose multiple small refactoring steps into larger refactorings.