fix parsing statements that include whitespace