Tightening up unused-ret-vals linter code a bit -- no functional changes