This is because #3060 was merged and I used `tm_parser_scope_separator_printable()` also inside the calltip formatting function that was affected by that pull request.
How should I resolve the conflict - merge master to this branch, rebase, or possibly submit the last 4 patches as a separate pull request?