Re-modeling some refactorings to open door to new ones.