Minor cleanup and new test.