Merge "Clean-up sharpening and compiler driver."