Hotfix/comap to cmt

Finishes conversion of "comap" to "cmt" for static utility functions.