More copyright header fixup.
Misleading comment & indentation fixes.
Cvar expansion: no cvar → empty string; no need to test for existence.