More moving around of expressions.