Move build queue check to integrity check, fixing BR#2687 in passing.