For 2:1 txfm, move the sqrt2 scaling to the end of the fwd txfm
function

This only affects the txfm accuracy slightly but simplifies the
range management a lot.

Change-Id: I2eef8c15b7e8958a1fb0f2ae632604fdbab86046