Finished untested refactoring of MealSelection

1. Hopefully all works right.