Resolved CVS merge conflicts. Re-added GcurMemap (for now).