Better expression wrapping for object handles