Cosmetics (and help static analyzers)