Code: Cleanup and analysis fixes.