fix replacement around macro expansion; add new benchmarks from Stavros Aronis