I checked in a new set of APIs at work that substantially clean things up in the project that I'm working on. Sadly, they are -- unsurprisingly! -- not at all compatible with the old APIs that someone else on the team wrote. This will mean a certain amount of retrofitting is required. But when it is done, it will be better.