Switch argument orders of option::from_maybe and maybe

[brson]

These take a default value first, then the option they are operating on. We typically do it the other way.

[brson]

The current order is haskell's.