Bug xxx: wrap field lookup on eval