Fixed benchmarks, per the new trait structure.
Collapsed traits.
Updated version to 0.22.1.