Manual: Some more cleanup.