Handle state delcarations not formed as a list, Fix #6544