More slight simplification

No functional change.