Merge "Break up the rest of stubs.cpp."