Don't really need this level of indirection anymore.
Centralize -executeUpdate:...
Re-instate trimming.