...
- Removed non-generic code.
- Fixed bug with ObjectController vs ArrayController.