Add better handling for parser options

Need a line before this.