Cleaning up code in AdvancedJokeList, untested.