Lazy and eager subtree inclusion is now implemented as a single
decorator.