Fixes to allow CythonMoses unit test to pass.

I'd broken the -c and teh -C flags with the previous changes