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

Towards #1031. I'll add some inline comments.
ha! that's my fault. I mis-read the diff. I thought you left the `if` in there, but were just pointing out it might not be needed. my bad.