Refactor code to make use of `xsl:where-populated` and similar

[yamahito]

Lots of variables being used to test existence of children before wrapping: much better to use xsl:where-populated!