FDP & IoC: some code clean-up.