Major cleanup around C301, C302, C303, C501.
This is prep work for Bug #3 and Bug #5.
Also managed to re-route Y_EN_BUF away from between C301, R301, C504 and R504.