Actually I realize now that this diff looks very confusing indeed. It is more clear if one can see the change with code before and after side by side, like in tkdiff or vimdiff. All this commit does is interchange two lines.