fix support for redeclaring builtin types as external extension types, add a big FIXME to mark for eventual removal