This preserves all the type information that's available, which reserves more
options for us upstream.