Bump patch version and slight reorg of versioning code.