Probably not, this PR is big enough as it is :). Filing an issue would make sense.