Looking at the patch set on bug 31569 it looks like we could quite easily get rid of some of these specific methods in favor of using object methods.