It is cleaner, avoids warnings, and will be needed when introducing ExtendedSWHID in a future commit.