No change in functionality, just unfactoring the refactoring

A part of it at least...