Merge "Clean up warnings in stubs.cpp."