Added <list> as an option to some non-terminals