Coding style tweaks for #399