phases
This removes some skipping of e.g. fixupPhase and cleans up occurences where this led to duplicating code
fix indentation