Simplify changeset.
26 files changed