Cleaned up version definitions.  Made DRY-er.