Shuffle some of the declarations around to match other implementations.
Expected to be a no-op.