Spiking on handling macros.  #9