
            Further refactor.

1348cb7