These changes do help the readability enough to warrant fixing here