FunctionWrappers: upgrade of template providing constants