Order options passed to ycpc consistently with other code