SQLForwarder code was extremely quick and dirty.  De-cruftify a little bit