More cleanup - duck typing for resolve