More NULL -> 0 cleanup.