PGPKey.unlock now yields self, so that with key.unlock() as ... now behaves as would be expected