Add IDENTIFIER-CONTEXT-RE; allow IDENTIFIER-FACES to be a function