Fixes macro calls always consuming an extra token whenever parsed

[Altoids1]

Fixes #846.

Summary

This was a huge and confusing rabbit hole for me that took up an unhealthy portion of my evening, but here you go.

Added a unit test based on 846's snippet so we don't have to deal with this again.

Changelog

• Macro calls no longer consume an extra token whenever parsed.