Re-fixed a bug preventing option analysis when no argument is awaited.