Another round of simplification.