[rc/pigeonhole] update and slightly simplify the sieve rules a bit