More layout-sensitive parser (no semicolons)
Merge branch 'indices'