Mark as deprecated, and update other docs refreences
Sort imports
Conform!
Avoid calling keys() repeatedly