issue #19135: More Express code