1) Turned off MR_SHORTHAND
2) Removed MR_SAFE_SET define… this behavior will now always happen