[geometry] avoid warnings for multi-line comments and unused var in new sources

[SVN r86581]