Revert nested "if" change so lists of non-tuples pass