Add @simplecontextmanager decorator.

Update existing contextmanagers to use new decorator.