Fix nesting of discretionary data objects within application related data.