Move key identifier aliases and minor formatting changes.
Merge pull request #67 from anchor/wip-propogate-memory-type-aliases

Move key identifier aliases and minor formatting changes.