Add 9699-ish more avatar combinations.