Fix initialization order to match that of the source.