EDIT: See post below.

Never mind, since Rhye seems to have addressed the remaining issues, I'll just stick to my "optimized" version and hope that Rhye puts my changes into the next official version. A mod can delete this or whatever.

Hoping for your work!