Use repository rather than repositoryId everywhere.

This should mean if an import filter doesn't set it, it isn't missing.

Fixes #29, ish.