bug 760876 - more work on style fixes