Add capability to cope with `with`