Added more constructors and collapsed EndProgramStmt to one production.