MADS: Reduce the scope of a couple of variables in MSurface