Revert "Factorize relationship between bitwise_andnot and bitwise_notand"

Actually is more messy than previous code.