Merge "Pre-initialize more by moving bad fields"