Be entity-agnonistic

Here's a try. Thanks for reviewing.

Looks good to me, and yeah come to think of it there really isn't a reason it can't be entity agnostic!

Merging.

Glad someone else ran into this same issue and found it helpful. I not only found it maddening to deal with, but when I have explained it to others they just assumed I didn't do something right or didn't know what I was talking about!

Automatically closed - issue fixed for 2 weeks with no activity.