Thanks for investigating this. I'll clean up the PR later on - in a few hours.