DDF-463 Fixed up marshalling code.