Remove redundant infs/nans, provide more useful arg names