There were some cleanup on debug/dead code and warnings fixes while I was working on JDK-8167340. As suggested, I'm separating the straight fix for JDK-8167340 with the cleanup so that we can have a clearer history in the repository.