I'd do it like this. Note I removed an if/else block in addition to
your changes.
I couldn't convince myself that this is worth pushing though; either we
push it to all branches (which seems unwarranted) or we create
back-patching hazards.
--
Álvaro Herrera 39°49'30"S 73°17'W