Replace defines with command-line options