surround with should split value declarations

[gavinking]

The easy version of this is: if the last statement we're surrounding is a value declaration, split it into a declaration + assignment, and put the declaration just before the surrounding statement.