Converting some of the Option() calls to Some(), where they look 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?)