While I was working on this, there was a point where the two concepts needed to be separated. I think you're right though, there's no longer a reason for them to be different.