Move simple array/collection support out of mappingStrategy (though
retained those classes until we fix embedded handling)