Reordered tuning.
Use C++ types.