Improve handling of recursive rules.