Witness-Authenticated Key Exchange Revisited: Improved Models, Simpler Constructions, Extensions to Groups