Fix tests after last change.
Bumper: preserve old style on init failure.