Untightened code.

Untightened code, splitting complex single-line code into multiple lines. This
allows for better coverage reporting.