Minor tweak to optparser for new options