Minor changes after failed deck refactoring.