69d0aa360 lib: Replace NVL with NVL-S