The code generated by cppumaker in the comprehensive case is in fact
broken, says sberg, and this is a way around it until it is fixed.

Change-Id: I0a3950d28e39a83f293f04fad9e0be80e131e3e9