Minor code cleanup and honor the datastore decoder.