extended loader (to support extensions) and conditional additions to INC both moved into main trunk's version