Move to_matchable back to private