Restructured FlexiCommandParser as preprocessor