Adapt to latest libcppmanip changes