Fix, reformat or rephrase several transformations

Again, thanks a lot to Sven for his review.