FDP: Some minor cleanup.