Simplify documentation and testing.