Some more cleanup around mmm-current-* vars