Yes, but I'll do that in a new issue today, rather than squashing it onto this PR.