Object comprehension fixes

Per #571, hope this saves you some work.