Rolled back some spurious syntax classifications