Do we no longer need a catch-all case here?