This was effectively done in every version of the forward processing, so I moved it out of the `if/else` clauses.