I didn't do it to keep the change minimal (both for review and to not introduce bugs), but if you strongly care, I guess I could do it.