Replaced other old variable references with references to $parseState properties