Rewrite+: Prep for larger patch.

No visible changes to customers. This is prep work for larger patch coming this week.