Made a safeguard's input cleanup happen in one place

The ordering safeguard cleaned up its input in two separate steps, leaving an earlier step still reading the raw version. All cleanup now happens once, up front, so no part of the check can see the unprocessed form.