Attempt to simplify/unify rules