Tweak the addition of modified columns to preserve column ordering.

Also split column addition and value setting into two statements.