Sure... that hasn't stopped many of these other changes that are also not directly related to this PR though...

For consistency, which would you prefer?