Fixed up all failing decay evaluations, except 3107