Introduce define_x_match_conditions methods, doc update