Porting to the latest clikit.