Convert expression to new Hydra convention