Tweaks to pods_no_conflict for tableless mode