Seems pretty redundant and inconsistent, indeed. Makes sense to line up. I'll check on IRC if I can find a taker for this.