Fix macro to deref vars