Argument macro janitor for func_odbc, fixes #7171