CLI: Handle options supplied before the command