Bug 1023, Bug 1024: Adapt to GlueGen commit 46faa59d439ef235d7691fc64d56eedc600ffa1a