Wrapping in changeset as a best practice thing (see issue #257)