Issue #20926:avoid extraneous call to sFillList