Added object on SingleObjectMixin returned context, some code clanup.
This is so MultipleObjectMixin can be used in the same way as SingleObjectMixin.