[#3199] Making format tweaks suggested by @WouterJ