I find this block slightly confusing. Can we clean up the suffix logic a bit to make it more clear what's going on?