Correctly save and restore env->a20_mask now that it is a 64-bit