(change:major) Adapted to current code base.
(change:minor) Code clean-up.