Beef up notations a bit more
Simplify unit-counit equation types manually