Removing const-ness does not seem like a sensible move to me. The query parser should not change state as nothing is protected against concurrent parsing operations.