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