Ported support for nosuffix from master to 1.6.x.

Ported the `nosuffix` support from 1.7 to 1.6. Hope it's useful (I see a debugging statement or two I left in while I was figuring out how the code worked). Works as intended in a local Stripes project.