I think a lot of the distinctions between rooms is silly and rather defeating the point. Just because you're more likely to plug a coffee pot into the kitchen, or sleep in the bedroom instead of on the couch, doesn't mean people don't plug in coffee pots in the den, or sleep in the living room, or run an extension cord out the window. If we're really doing this for safety, the requirements should be universal, regardless of what the architect indends the room to be used for. If AFCI is good for fire protection, and GFCI for life protection, put them everywhere. Otherwise, don't require them at all.
Maybe I'll put in a 2011 code recommendation for 100% AFCI/GFCI/TR, and 2 dedicated 20A circuits for each room
