Get rid of :source alias for :object.  Tests don't all pass at moment.