Right. I ended this as a quick fix after I already opened the pull request...

I feel the two functions should be combined. They're always used together, from one place, and it's a special use that's hardly relevant to anything else in lizard-datasource so doesn't need more than one function.

But then naming gets harder. I'll sleep on it.