Get rid of opt_parse hack for Koan