Further fix and cleanup of the in-memory split change.