Avoid temporary boost objects.
More change.