Fixed optional argument parsing.