Changed perfect forwarding makeEntity function to actually forward,
rather than copy...