Android - some minor refactoring for base model (prepping for legal foods list work).