Fix to avoid having to rely on internal _get_type functions