More environment shims, plus fun decorators