Some cleanup and fixes triggered by --warn-uninitialized (see #972 (closed) discussion).
--warn-uninitialized