More minor coding convention fixes