Modeling and Forecasting Aftershocks Can Be Improved by Incorporating Rupture Geometry in the ETAS Model