Inline two methods in their callers.
Simplify.
Update Changes.