Squashed and merged. Thanks again.
I'll push a release soon.
FWIW, a decorator approach would be technically superior and probably less error prone, at the expense of more obscure function signatures. However, since there aren't too many early returns in the code, the straightforward approach here is okay.