p2: rename wavy to bitnot rule, and enable it