Fixes CMS dictionary build issue with forward declaring a template argument
of enum constant type - something we do not forward declare.