Simplify Message.getopt, add test.

I was going through the Message class, in order to better understand it, and noticed an opportunity to simplify this method.  I've added a test for it, but it really needs 2 tests.  Can you tell me how to add an OPT record to a message so I can test that?  Then I can add the test and repush; or feel free to do that if you like.  Thanks...