Attempt to avoid errors on aliased 'contains'
Merge remote-tracking branch 'cursork/contains-hack'