Finished cleaning up DataStore read/write functions.
Merge remote-tracking branch 'origin/pop3-support'