Have you tested this version of `separate_comment` with the unit tests in `extras/tests.py`? There was at least one unit test that tested the previous version of the function. I am not sure the new version passes all of the tests.