Lint and integrate new NanNew