Down with env vars and bad death behaviour

The commit messages speak for themselves, but I really hate having to use environment variables when I'm just playing with something.