TRQ-1993. Fix a regression caused by refactoring.
TRQ-1994. FIx a regression caused by the same refactor - commands such as momctl -q check_poll_time weren't displaying their results correctly.