FIX: command-line options were being lost.