Minor cleanup pass for unused imports and locals.