Align to latest libcppmanip API changes