Style fixes for #543 / #545