I think this refactoring is almost entirely yak-shaving and should be removed to keep the history of this change clean to a simple additional when clause.