@JohnGB: Would you please adapt the benchmarks according to my proposal? There may be no functional advantage but the code will be cleaner after all.