Trivial cleanups & tweaks. Bump version.