Revert "take value, not function, in getOrElse/orElse"

This reverts commit bdb67e85ca6a8acdcee78c8912c70578c90b73a9.
To simulate lazy evaluation.