[CHANGE] Invert template-var noliterals to literals, include in --v2.