Minor changes to the function interface.