Yet more rogue entities. Last commit caused more problems than it solved. I hope this one works better.