Yet another style fixes