make the --fast logic work with amendments too (broken since 4865ce2ad5704dfacf6977995becdd5eb15e8253)