Resolve model references even if annotations are not populated

This should fix #12093.
Merge branch 'bug-fixes' of github.com:melissalinkert/bioformats into bug-fixes