Filling in some env/cli unfuddling for remaining opts