Refactoring merges for greater flexibility.