Further C extension cleanup.