Parametrized macro substitution, added %xdefine (not yet tested).