BUG-865: eliminate references to ExtendedType and base types