Get rid of uninitialised variable warnings.
Merge branch 'flint-2.4' into trunk