I commented about this on the actual patch. I think it is ok for now, but after this PR is in, we need to figure out some uniform handling of these, once and for all.