Thanks is there a way to expand this so surrounding punctuation can also be suppressed? For example, if the source is present, I would like there to be a comma after the title and if there is a doc-date, then I want it surrounded by parentheses.