Header refactoring: unify and de-catchall witness code.
18 files changed