Two tests were failing because of a failure I caused in resolving a generic
type for a variable that was not initialized.  These are fixed by this change
(will probably commit on its own)