Bibref. Some more cleanup.