Made some internal extensions public.