Hmm, very good point(s).
I'll revert to using your approach in the PR I have open.