e_capi.c: update from HEAD.