ORACLETOOLS-74: Cleanup of new matcher classes.