Better support for functions.