Found another place in the code where we're removing empty strings, so factored the code out again into a separate function (next step is to move it out of this file to a util module of some sort, so it can be easily tested outside of the context of this service adapter module).