Minor entity cleanup.