Benchmarks: Minor changes in response to comments

- Utility classes static, final.
- Use EnumSet where appropriate.