Refactor some synthesis benchmarks