The other half of those fixes I just mentioned.

Highly preliminary.