Tidy up the matchers cookbook.