I 100% appreciate the review, I'm glad people are reading/paying attention to these modules! :)

I hope with time we can help remove all your forks and collapse them in.  We're hoping to make these changes as painless as possible so anything else you spot is greatly appreciated!