Dish: Added double comparison macros
Dish+Ingredient: Made sure lines are shorter than 80 chars.