Now that we have lambda style security configuration we can further
improve readability by switching to one statement per line.

See gh-17525