That would definitely look better. In fact, this needs fixed altogether. However, I don't think such a change should belong to the patch which you are working on. For now, please just leave it as it is.