Add processing of "include" directives as an explicit form of fallback handling
Tidy up cruft