Fix origin xref mess; obsolete ORIGIN