[PATCH 0/2] Remove static analysis cruft