BZ55552: EL3 compatibility with type handling.

Could cause NPEs.