Fix some places the parser would choose the wrong option.
Fix some places the parser would choose the wrong option.

Also, "//" comments go to the end of the line, not the file.

matthewd/capuchin,matthewd/capuchin