Modified in visitor and tests.