Add flatMap()
modernize signature of emptyOrSingleton()