couple of these are currently found in index data, but these should
all be handled in the same way.

Closes SF bug #952737.