More ONBUILD cleanups