Remove more null propagation to fix AppVeyor