Ungh. Checkpoint. It looks like my last bactch of changes in api-libraries didn't get merged before I forked into this new repo; the OSS one is missing a lot of bugfixes