Some additional cleanup of the MCC driver before merging.