Minor clean-up of auto upcasting.