Clean up of table header.
Change table header specs to use new syntax.