added support for 1:1 #defines (#define a b), multi-element/macro still to go