Fixing line-length and import order in datastore.query.