Fixing up some scrutinizer dead code issues.