More simplifcation, and hopefully less numpy.