Fix so that we only set CONSOLE_FROM_TEMPLATE if we haven't set any
other command line option.