Not pretty but it's the thought that counts!
Also, make one adjustment for consistency.
This stuff could possibly be tidied up a bit more later on as well.
For 8.5.12 ?
Probably not for 8.5.12.
It isn't critical.
It hasn't been tested by anyone other than me.
This patch may simply be considered a suggestion or prodding towards what changes may be warranted.