Fix remaining null-passing method.