Clean up function arguments and return types.