Looking good, except for an issue with and/or

It looks like and/or with >= 2 args will warn all of the time, because
the macroexpansion on the 'way down' includes an expression of the
form (and x).  Need to figure out a correct way to suppress this.