Static-check fixes from @lespea #1657, batch 8/n (#1710)

Static-check fixes from @lespea #1657, batch 8/n (#1710) #1596