Cleaned up C interface some more.