more simplifications

3 jobs for NIFTy_4 in 6 minutes and 39 seconds (queued for 1 second)