Tweak magit a touch. Robustify startup.

Fix some diminish issues.