All sub-bugs have been addressed, so I'm closing this tracker bug as well. Thanks for working on this.