back out some non-backwards compatible API changes, and add alternative
method that matches typesafe query method name. Fix serialVersionUID
warnings. Simplify some of Query.execute methods