Fixup target linkage, fixup Fileset usage in ParseContext - we dep on commons now for this.