*8759* Simplify getTemplateVarsFromRowColumn
*8759* Return self-docs added