Filter out duplicate messages when no face

And fix other coding infelicities