Use correct internal types.