Stylistic change - jam construct like 'if $(var)-is-not-empty' does not actually test whether the $(var) variable is not empty and instead tests whether the variable is defined at all to any value. Specifically, if the variable is defined as an empty string, the test will still pass.

[SVN r86565]
Minor stylistic line wrapping changes.

[SVN r86566]