Re-worked GenerateDeserializers to support new test

I've put an issue up on the google code site. Issue 177.