consolidate two AC macros in one
consolidate two AC macros in one

svn path=/trunk/StrategoXT/; revision=2700

Apanatshka/strategoxt,lichtemo/strategoxt,metaborg/strategoxt,lichtemo/strategoxt,Apanatshka/strategoxt,Apanatshka/strategoxt,metaborg/strategoxt,lichtemo/strategoxt,Apanatshka/strategoxt,metaborg/strategoxt,Apanatshka/strategoxt,lichtemo/strategoxt,metaborg/strategoxt,metaborg/strategoxt,lichtemo/strategoxt