Work on 'with' support.