How Many Legs Do I Have? Non-Simple Roles in Number Restrictions Revisited