Simplify by removing Joker class.