Fix bad line endings; remove some useless inits.