2969349 Use more macros

Authored and Committed by zbyszek 9 years ago
    Use more macros
    
        
file modified
+9 -6