Add parser support for control structures