Another round of applying Craig's suggestions.