WIP SI-6187 A slightly less ugly cast.