Converting some of the Option() calls to Some()

... at least where it looks like they can be converted.

Carl and I ran into problems with this before, were the use of Option() actually broke other code, which was using an implicit ordering defined ... somewhere else now, I forget.  (Carl, do you remember where this was?)

Unless I'm missing something Frank, and there's a specific reason to use the Option() syntax as-is?