Major part of the refactor of stage-splitting is done.  Small optimizations, as necessary, remain.