expand return types beyond string/nil for SliceScan and MapScan
Merge remote-tracking branch 'origin/slice-map-fix'