JSON now gives start of body/bundle declaration, so simplify parser.

Search down, split into header lines (between declaration and code), and
code lines (including declaration). Parse header lines as doxygen.