somewhat better handling of "constant" functions