Revert "Revert "Use separate version constants""

This reverts commit 3423d43be618dd3613929306ffd9d34c7a3e9767.