This also solves the last remnant of overlinking as described in GH issue #133.

 Fixes ArcticaProject/nx-libs#133.