I believe that #2206 was merged a little hastily, and I have made extra comments on the PR post-merge. To try and prevent these extra comments from getting lost, here's an issue that references them.

Ping @bjlittle