Bug 9021: Fix conflict with bug 15446 (type vs _type)