Fix JEP sub/div and remove redundant returns.