...so they work from CppunitTests (which make use of that "direct mode").

Change-Id: I92b72fb708ac1868644111b208f92ac58610ed11