Fix more MC layering violations.