Di Yin and I returned a local Japanese restaurant, Yanagiya. Given that we liked our first visit, it's been surprisingly long time had elapsed since it. At first we sat downstairs (see picture, which includes Di Yin and her set meal), but they moved us upstairs as soon as they had space. (I think they realized that was the most effective way to get us to stop glaring at / asking other customers to stop smoking.)
The room they moved us to upstairs was a similar one to the cute recessed floor one we ate in last time.