Code clean-up. (Andrei Gheata).