Minor Showtime refactoring.