Cleanup, pre-ICS Android support, sidestep birthday issue.

Cleanup: JavaDoc, comments, rationalize some variable names.

Birthday issue: right now, add() will write a birthday, but it doesn't
get read back properly.  That needs some work later.