A few more touch-ups for cortex-m4 cleanup