Cleanup a little @Nonull and @Nullable annotation processing