Added a few more methods, but because of all the inlining, test coverage isn't 100%. No matter.