The main change is in 34164c0. The rest continues my quest to have fewer functions so that it is easier for readers to find the actual api and follow the flow of things. What do you think about t...