population step_one_replay(): Fix various cornercases