Stupid fixes for parsing cmdline arguments in HStoreTerminal