Tweaks to object return formats.