Wrapped a metafunction call into a local struct to try to workaround a problem with add_template on the intel compiler.