Simplify promotion of let-statements