More work on command parsing and configuration.