Tighten static analysis a bit