Move key identifier aliases and minor formatting changes.

Move aliases from Store/Memory.hs to DataSource.hs