Small cleanup using static analysis