app-crypt/ekeyd: further cleanup