Move conditional.then to handler.then and remove Handler.called_with
Update documentation for removal of called_with