Changed to SieveDefinition

Still need to separate the concepts of SieveDefinition and Sieve (which
is a SieveDefinition for a certain set of acceptable values).