Convert Cipher to use new Lang, permit legacy usage