Speeding up the normal form code for plus.