Improved handling of already-suffixed codes