Refactored/cleaned-up.
We now assert that what we receive from GD is the right 'kind'."