More flexible memory options, more flexible value matching for choices.
2.5.15dev