Cleanup the DocBlocks, add missing variables.