replace _set macros with simpler assignments