Change to instantiateGeneric, removing some unneeded output. It isn't much more complex but it is and could be reverted need be. Fixes #199.