Came here to mention jj fix. It is a fundamentally more elegant way of doing things.