Further reduce underinitializations