could this have been missed for so long?) Based on additions by Ken Nakata <kenn@eden.rutgers.edu> in PRs 3839.