Further small simplification of the keymanager

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>