Add newline; (some?) fwd decls do not have one.
Use initialization lists; that is what they are for (Coverity 52116)
Extract the CallFunc wrapper "by hand".