[#8556] simplify more calls
14 files changed