@bwo: this does make the form less elegant, but these errors were hard to catch. Put in another branch, PR.
more informative error
(cherry picked from commit fda383d018305cdd5f399aaa8a672e0264445522)
Merge branch 'propose-guarded-fns'