Couldn't we just always pass a list to this method and avoid this elif? Looks possible.