Supporting comments and restructuring to avoid module_load_include() call