Can we switch this over to a parsing check as well?

Also, we always use brackets around if statements, even if they are just one line.  Can you add the brackets?