Pass a more proper span to the syntax expanders

Closes #5794