Hello,

I have updated this patch to make it compile and behave on Emacs master
at 1d93540371aadec8f877bd781267d38d411c40a0 (current a few hours ago).
The updated patch is attached.

I queried Clément, who has ok'd my shepherding this patch along.

CPU profile data I've gathered suggests this change has almost entirely
stamped out the face-related hot-spots I'd seen previously.  Hooray!

Cheers,
    ~jashank

-- 
Jashank Jeremy
WWW	jashankj.space
pgp	FE4D6AA8 3736591C FAD30D97 DCE96CF5 8D931E04