Redefined without-updating-selection function as a macro.