subst.py, reentrant_def added