ivory headers: separate into two.
  * asserts header and the rest.
  * small refactoring for two headers.