work around new analyzer warnings

supposedly these are here to stay, so deal with them