Remove more redundant CMSIS pieces from here.