Shorten lines of code, to prevent breaking in appendix. Leave evaluation code untouched, as no semantics were changed (and the old code can be obtained by variable substitution and deleting newlines