Reworked how the parser handles statements