Adjust the regexp so that we can handle extra sub versions.