better handling of recursive definitions

2 files changed