rules: remove submatches, add not-hand-side, and made rhs optional