Minor cleanup, convenience, doc, and tests