Fix a rare case where units might get stuck around other idle entities, and clarify a related comment.
Refs #3471