No change in behavior, but the comments needed updating, so I updated them.
Then I noticed a never-true if() case and removed it.