Agreed, I was a little out of it when I made this and I think I was a little mindless swapping these things out. To avoid merge conflicts I think it makes sense to cherry pick #159 into this pull request. Let me know if you disagree, otherwise I can take care of that to update this pull request and close #159.