Improve mappings for status functions.
Improve mappings for diff functions.