some hc_matchfinder cleanups