Only add a number if needed, and respect that suffixes are at the end.