More coding convention cleanup.