COMP: Fix funciton signatures in .cxx and .h to match.