Bibref fixes.
Merge pull request #189 from tobie/bibref-cleanup

Bibref fixes.