Remap D to C for command line version.