OK, so walk me through this quickly, I'll have a couple of questions in line:
Why is the suffix here? Any way we could turn this into a delimiter in keeping with the rest of the style? Might be necessary and appropriate to handle collection-title for journals in an entirely separate macro. In that case you could also avoid the awkward test in line 1136