Thanks Shawn Clowater! I am in the midst of some massive local refactorings for 5.0. I hope to be wrapping those up by end of this week. It'll likely be next week until I can look at this. But I will.