continued work on FromMaybe and similar functions