More work on autorestarting.