Add camel case support for Return Where and With expression builders, with tests