merge cleanups from dobj_experiments

1 job for nifty2go in 4 minutes and 50 seconds