Remove getExtendedType from base type extension
* Add missing parent calls to form type extension