Fix bugs in the c-parse-state mechanism. Reuse some markers instead of