I believe that's right. The Matsu-no-ma Lounge was considered CS at one time but I think it's now been taken off the list.
We ate at Yakitori on our last trip. It was a nice change from burger and chicekn strip type CS. I looooved the chestnut cake, very similar to a hazelnut torte!