- Reworked mousebender's resolver to try to accommodate extras appropriately