Rework AmpersandsPipesVsAndOr to AndOr

After a brief discussion with @whitequark I decided that the use of
and/or should simply be discouraged altogether. This commit takes care
of that.