Sorry, I managed to omit the majority of face names from the patch which
updates the face spec syntax, thanks to a combination of rushing and
text collapsing.  Kindly find attached a revised version.

-- 
Basil