(face-spec-choose): Change syntax so that the list of attribute-value pairs is now the cdr of each clause, not the cadr. Detect old-style entries, and handle them. Use pop.