To avoid any backward incompatibility issue and future problems, I'd keep two separated templates for the two different defines.