Re-Kejigger the pin definitions one more time to more logically group things.