Use 'hi2' all the time
Fixed 'magit' commit quirk