Fixing more clas_state->len bugs during push/pop operations