This removes need for some casts (at least, more than it adds need
for new casts!).