I'd have sworn I simplified this logic a million years ago. Must have forgotten to commit it. Anyway, this is not really any functional change, but simplier logic that might execute a teensie weensie bit faster and is mainly just easier to read.