Merge branch 'simplify_for_const' into 'NIFTy_5'

Simplify for const

See merge request !295
11 jobs for NIFTy_5 in 19 minutes and 22 seconds (queued for 2 seconds)