...and rearrange a bunch of code so that all these arguments/members
are always in the same order.