More tab->space conversions

Don't know what happened but some earlier changes got lost and had to be
redone. I'll figure out this Git thing eventually, I promise! :-)