Revert "Better heuristics for when to add a comma when de-noting a note."

This reverts commit 865a5e77f21a84d2014891bc5080b5245472eb8a.