Cleanup. Triggering and mandatory components are now always matchers. Clarified some behaviour of matchers with empty component sets.