Improve the API for the obj-iter code a bit.