Fixing a wrong fix...
A bit of cleanup to ugly u-benchmark