Improved implementation of OutfitCase

Outfit case now actually serves as a "bridge" case
where we simply use an entity from outfit to
match consecutive cases.