...and remove some highly specialised methods now that they can just
be implemented directly by the previous callers.