Attempt to reduce merge conflicts.
Vanilla updates.