Demote self to an (almost) regular argument and remove the env param.