Backport 6e0b1c6 + 207e86a to 3.3

Backport changes to epscript `one_of()` function to 3.3 branch, for inclusion in next 3.3._x_ release.