Now passes all existing tests.