Clean up address/key prefixes and add references.