I believe this is fixed and ready for review (once again).