Complete refactoring exercise (single implementation of completion transition logic)