Cleaned up matcher code.