Remove unused arg.
Update dependencies, resolve a few null pointer exceptions.

It's still a pain to make sure that different forms of data interact
nicely. It seems overkill to wrap everything with a 'matrix' call.