Did you look into the macros that I talked about? Perhaps that one can be reused here for consistency?