Fix Sphinx problems with cmdline flags that take defaults from environment variables