Update __SET_VAR() macros to reflect changes made to matiec

2014-05-26, mjsousa