Clean up errors with header region classes.

From #3621.