I see the traction here, but I cannot really get fully convinced by a grouping of the timeouts without more input. As a whole, I think that Sirisha's patch is fine enough on its own.
Perhaps LSN is enough for now as it will be the value that will vary the
most with heavy usage. I don't know how often TIMEOUT values will
vary however, so I'll drop the options normalization idea for now.