Thanks @davehunt, that does work, and it's nicer. I have updated the PR.