This was a bit premature. Some of our test cases give indentation errors. I'll post another file when it is really ready for testing. Meanwhile comments on our intended solution would be greatly appreciated.