Differential forms and canonical variables for drift motion in toroidal geometry