Resolve type errors resulting from merge.  But I must have screwed something up because 12/70 tests fail.