Wires replaced!

Out with the old:

In with the new:

Wires are protected and the junction box is gone, simplifying things quite a bit. Biggest thing now is to replace the marginal light switch!