Rework ExecuteParser parsing logic.