More work on new autorecast code.