Simplified the Acquia Search client code, implemented support for the service builder.