Style fixes for #543 / #545 (final pass)