Some compilers seem to think that there is some uninitialised usage here. Work around this. Closes #1891 Change-Id: Ic97a4b589fd2a0c33418a209557b7ce29009c7bf