Some fixes to make using expressions nicer in DAWN.