Got a little more work done on the car. Installed new clutch, gas and heater control cables. Also installed the rebuilt pedal cluster, new gas pedal, shifter and shift rod (front half) and heater control lever. Since I marked the shift rod on the shifter before I took them out, the shifter should be fairly close to the proper alignment, but won't know for sure until the engine and trans are back in.
Pedals:
Shifter:
Cables and shift rod:
I also started to take a look at installing the heat exchangers on the engine. That's when I discovered that my great pile of muffler gaskets are all for 1.7L engines.

So, now I have some 2.0L gaskets on order....