More tweaks for #972 traversal for custom-simple fields