Merge bug fixes from CEDET upstream.