Fix message style and ODR violations.