Add command layer in git modes.
Add command layer in nxml mode.
Avoid loader:reload errors by define-key usage.