Switch from old-style fail! to new-style.
(I'll leave it named fail2! until next snapshot).
Merge branch 'master' into preserve_bad_header