Clean up the way custom matcher are specified