Merge "Add key-value mappers for improved safety."