XD-2107&1048

I saw some weird behavior whereby metrics named `foo` and `'foo'` get created, but for the purpose of centralizing demo content, I'm issuing the PR.

PS: we should definitely have automatic creation of option `fooExpression` when option `foo` exists
looks like in several classes, your changes remove these indents