cosmetic #define clean-up.