Remove a few remaining uses of loc