TOMOYO: Cleanup part 1.