“self” of a TypeDef correctly resolves to the typedef now. Simplified and remove some code in bootstrap.