Further simplifications from stassats.