Fix some doc comment errors that were preventing build.

Just the core changes, not the generated files.