Minor nits and slightly faster test.