WIP: and push the refactor a bit further
Fixes #22.  Need to repeat the same for the xs argument.