Incorporate review feedback, better headers parsing, account for
annotations.