Debug last refactor.