Fix using nested options with Option.orElse

[IanManske]

This address issue #3051. I've made changes to the obvious areas, but I'm not sure if anything else needs to be changed. The (new) tests pass and I also got the expected results as described in the issue with a local package build.