Split passes

No semantical changes, should be straight-forward, unless I screw up something (but hopefully you, eagleeyes, will notice! :))