NXP-11389: improve Oracle path optimizations