Good thread, Prophecor. To me, this is a major, major issue. I hate to admit it, but I never even thought about my baptism questions until reading on this forum. And yes, I was baptized after '85, so I had the new set. At the time, like you say, I was swept up in emotion and would have done whatever I was told.
It's interesting, not only did I not notice the questions, but I agonized the entire weekend (I was baptized at a District Convention) that I was maybe not ready to baptized. I felt very guilty that I was somehow unqualified to get baptized, and that Jehovah would be unhappy with me. I was only 13, and I honestly had never done anything - no smoking, no lying, no masturbating, nothing. I was very caught up in the fever to be perfect and free from blame, and I was afraid that somehow something was wrong with me.
It was the convention where they released the Mankind's Search For God book, and I read the entire book on the way home Sunday (2 hour drive). Interestingly, that book is what got me thinking outside the box as far as witness beliefs go.
That second question is just one more example of the society learning to protect themselves in every way. All liability is on the individual, and none of it is on them.