Use method added in 94e3a2af
Forward declare token_vector & token
contents_vector field
Cleanup previously moved code
Added forgotten include
Parsing test cases