Made generated code less dependent on path...