Replace a few explicit types by the 'auto' keyword

This is primarily in preparation for the next patch, which becomes much
shorter with 'auto'.