Use listify instead of super-crazy-pattern-matching.