Fix up some function interface inconsistencies