Style fixes for Symphony 2.4

Tested in 2.3 and 2.4; plays nicely with both.