more work for bug 760876: style fixes