A set of smaller API tweaks, and polishing.