More Peripheral-to-pins cleanups