fixed statement and expression parsing