Changes for parsing optional arguments.
Merged.