Slight date disambiguation tweaks.

We now look only at OContrib and OYear, if there is an
OContrib; otherwise we look at everything.

This solves a problem in which locators caused failures of
disambiguation.

The code here is really a mess, but I'm hoping it can be
patched up.

Cf. issue #14.