Fixing trunk in a way so that it compiles again.