Tidying up NonNull assertions.