Linker clean

Same as #194 but with a sensible history.