Merge in additional compiler/test cleanups.