Parse alternative syntaxes, not the current ones
Merge branch 'nit'