Switched to a tabbing algorithm which crosses boundaries between blocks
Made tabbing algorithm handle command blocks nested as arguments