Re-instate support for environment variable expansion and the -D flag. Now it is done pre-parsing, however.