CODE-30,CODE-31: Consolidate duplicate style declarations.