Cleaned up stride calculation, easier to parse now. Also, Expr is nextgit diff