Delegate more methods to our own overloaded versions

Makes it much easier to keep track of
entities.