Remove some more long types.