These are the pid-as-solr-field occurences I can find.

Towards #1031. I'll add some inline comments.
The `if` at the end seems unnecessary: in either case we end up with nil.