Use more variadic templates
Fixed doc/CML