Improved IncludeExpander insignificantly.