Cleaned up some code that wasn't handling version tokens correctly.