Hot fix for instantiations.

This should remove all unnecessary instantiations. It builds, links and run build tests on my machines.