Improve cfi.c command argument parsing.