API tweaks and doc tidy-ups.