Updated to use composition & delegation.

Removed the monkey patches to Array & Hash.