@PeterDaveHello done, hopefully right this time! Thanks for guiding me through this (it’s my first pull request, in case you couldn’t tell).

Hi @PeterDaveHello, the issues you mentioned should now be fixed. (I’m making this comment in case you’re not receiving notifications about the fix commits and test automaton pass, but do tell if more fixes are needed.)