Better support for function wrappers.