* Removed all remaining references to the 'merlin' grammar * Labels with trailing numbers are now detected as labels * Branches to positional labels are detected properly now