Issue #2331617 by Pedro Lozano: Avoid some notices.