Adding better restrictions for ClusteringOrder. Adding correct discard operators for Lists.