Version bump; tiny little bits of code organization.