Yet more C API changes :|