We should collect all of the annoying bits of the library to clean up before the major 1.0 milestone here.