Small improvements in parsing command line options