Static-check fixes from @lespea #1657, batch 7/n (#1709)

Static-check fixes from @lespea #1657, batch 7/n (#1709) #1593