made benchmarking more flexible

All hail X-macro's.