DRY up changes.