Grammar bug fixes from CEDET upstream.