Use new data model differentiating single line loop blocks from simple blocks

Use new data model differentiating single line loop blocks from simple blocks #43