Export type code improved.