> ... a lot of the other code didn't (trying to maintain consistency) ...

Ah, then you can safely send PR that fixes that in a separate ticket.