I totally agree. I'd update the PR but it's been merged... so #1140. Apologies for the double PR. :)