Minor cleanup, started futzing with pin allocation.