Bug-fix:

 - Cannot expect faceMap to be computed in a demand-driven way. It can
   also be set externally using the entityMap member function.