Push more control logic from stage 3 to stage 2.