Update magit diff colors, TODO.
Wrap some requires in when clauses.