Last commit contained errors. Revert most of it, keep only the tweaks to link()...