This cleans up functions with too many arguments. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>