Handle catchall matcher in if_field consistently