Make NullTypeAnalysis work again