Progress on :respond_to built-in matcher rebuild