Revert "Add a 'which_callback' keyword to match(), which limits when the python callback will be called."

This reverts commit e2cb4e39.