@andrewhayward I've got a fix ready to land - just prepping the pull request, thanks for piling the feedback in!