Fix bug where the value returned from a context manager's __enter__ wasn't added to the runner's context.
More code coverage tweaks.