Adapted to glue code generation changes.

33 files changed