Ok, I think this _actually_ matches the concrete syntax now.  More or less.